bugfix: fix map type can not be merged #1367
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## master #1367 +/- ##
==========================================
+ Coverage 17.29% 17.35% +0.06%
==========================================
Files 190 189 -1
Lines 11913 11836 -77
==========================================
- Hits 2060 2054 -6
+ Misses 9706 9634 -72
- Partials 147 148 +1
|
zhuangqh
reviewed
May 22, 2018
| if !srcElem.IsValid() || isEmptyValue(srcElem) { | ||
| continue | ||
| } | ||
| if dest.IsNil() { |
There was a problem hiding this comment.
@Ace-Tang Add a test case to cover this statement?
like
{
src: &simple{Sd: map[string]string{"go": "gogo"}},
dest: &simple{},
expected: &simple{Sd: map[string]string{"go": "gogo"}},
ok: true,
},There was a problem hiding this comment.
Already add the test. @zhuangqh
There was a problem hiding this comment.
cri-test alway fails to pull image.
add more merge map test Signed-off-by: Ace-Tang <[email protected]>
zhuangqh
approved these changes
May 23, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Ace-Tang [email protected]
Ⅰ. Describe what this PR did
fix map type in daemon config can not be merged.
Ⅱ. Does this pull request fix one issue?
Ⅲ. Describe how you did it
Ⅳ. Describe how to verify it
Ⅴ. Special notes for reviews